Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 03:41:21 +0000 (03:41 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 03:41:21 +0000 (03:41 +0000)

Trivial merge